SparkN0de-git - /page/commit.mu

Micron Document

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

| SparkN0de-git | SparkN0de |

Node / ReticulumProjects / Sideband.git / commits / b3e403d

Commit b3e403de40c15ac80115d10a2ec7113cf7ace762

󰉖 Browse tree at this commit

Parents : 49a55b7

Author : Mark Qvist <mark@unsigned.io>

Date : 2022-12-15T17:01:34+01:00

Added error message on service error or crash. Added error message on USB control connection errors.

Changes

1 files changed, 7 insertions(+), 5 deletions(-)

M sbapp/sideband/core.py +7 -5

Diff

diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py

index 0be4f694..9c15fe12 100644

--- a/sbapp/sideband/core.py

+++ b/sbapp/sideband/core.py

@@ -449,9 +449,6 @@ class SidebandCore():

self.config["last_lxmf_propagation_node"] = dest

self.message_router.set_outbound_propagation_node(dest)

- if not self.is_service:

- self.owner_app.root.ids.settings_propagation_node_address.text = RNS.hexrep(dest, delimit=False)

RNS.log("Active propagation node set to: "+RNS.prettyhexrep(dest))

self.__save_config()

except Exception as e:

@@ -1297,8 +1294,11 @@ class SidebandCore():

else:

if hasattr(self.owner_app, "usb_devices") and self.owner_app.usb_devices != None:

if len(self.owner_app.usb_devices) > 0:

- target_port = self.owner_app.usb_devices[0]["port"]

- RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, pairing_mode = True)

+ try:

+ target_port = self.owner_app.usb_devices[0]["port"]

+ RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, pairing_mode = True)

+ except Exception as e:

+ self.setstate("hardware_operation.error", "An error ocurred while trying to communicate with the device. Please make sure that Sideband has been granted permissions to access the device.\n\nThe reported error was:\n\n[i]"+str(e)+"[/i]")

else:

RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)

self.setstate("executing.bt_pair", False)

@@ -1630,6 +1630,8 @@ class SidebandCore():

if self.interface_rnode.online:

self.interface_rnode.display_image(sideband_fb_data)

self.interface_rnode.enable_external_framebuffer()

+ else:

+ self.interface_rnode.last_imagedata = sideband_fb_data

except Exception as e:

RNS.log("Error while adding RNode Interface. The contained exception was: "+str(e))

──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────